adapt to GSignal signature changes.

Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.[hc]: adapt to GSignal signature changes.

diff --git a/ChangeLog b/ChangeLog
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1371d0d678e9fff9273c97ab7b22694404b92e34..003479f571725a5bca724ab839c3fc262720412b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Fri Oct 27 18:51:44 2000  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtksignal.[hc]: adapt to GSignal signature changes.
+
 2000-10-27  Robert Brady  <robert@suse.co.uk>
 
        * configure.in (ALL_LINGUAS): Add en@IPA (English, phonetic), 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6780e35362c14e0b4435337ef0a271d6b74dc984..eb06e2a2a26f4f5285fc7eeaa5b4b530699fbbb6 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -450,7 +450,7 @@ $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
        && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $(@F)
-$(srcdir)/gtkmarshal.c: $(srcdir)/stamp-gtkmarshal.h
+$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
        cd $(srcdir) \
        && glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \

diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index bebc4ff36c1b7025e21f4292fd2fd0ba20f4a1f6..116da01610d1153aa2c53129d74ef419f463e3c7 100644 (file)
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -21,7 +21,6 @@
 #   NONE        deprecated alias for VOID
 #   BOOL        deprecated alias for BOOLEAN
 
-
 BOOLEAN:POINTER
 BOOLEAN:POINTER,INT,INT
 BOOLEAN:POINTER,INT,INT,UINT

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index bebc4ff36c1b7025e21f4292fd2fd0ba20f4a1f6..116da01610d1153aa2c53129d74ef419f463e3c7 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -21,7 +21,6 @@
 #   NONE        deprecated alias for VOID
 #   BOOL        deprecated alias for BOOLEAN
 
-
 BOOLEAN:POINTER
 BOOLEAN:POINTER,INT,INT
 BOOLEAN:POINTER,INT,INT,UINT

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 365b09cec121bea9e9858372489f12681d2a6316..b911ae6a969c7940d8b6f11092ea2cb15e8ed168 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -94,7 +94,7 @@ gtk_signal_emit_stop_by_name (GtkObject   *object,
 {
   g_return_if_fail (GTK_IS_OBJECT (object));
   
-  g_signal_stop_emission (object, g_signal_lookup (name, G_OBJECT_TYPE (object)));
+  g_signal_stop_emission (object, g_signal_lookup (name, G_OBJECT_TYPE (object)), 0);
 }
 
 void
@@ -106,7 +106,7 @@ gtk_signal_connect_object_while_alive (GtkObject    *object,
   g_return_if_fail (GTK_IS_OBJECT (object));
   
   g_signal_connect_closure (object,
-                           g_signal_lookup (signal, G_OBJECT_TYPE (object)),
+                           g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
                            g_cclosure_new_object_swap (func, alive_object),
                            FALSE);
 }
@@ -125,7 +125,7 @@ gtk_signal_connect_while_alive (GtkObject    *object,
   closure = g_cclosure_new (func, func_data, NULL);
   g_object_watch_closure (G_OBJECT (alive_object), closure);
   g_signal_connect_closure (object,
-                           g_signal_lookup (signal, G_OBJECT_TYPE (object)),
+                           g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
                            closure,
                            FALSE);
 }
@@ -144,7 +144,7 @@ gtk_signal_connect_full (GtkObject           *object,
   g_return_val_if_fail (unsupported == NULL, 0);
   
   return g_signal_connect_closure (object,
-                                  g_signal_lookup (name, G_OBJECT_TYPE (object)),
+                                  g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
                                   (object_signal
                                    ? g_cclosure_new_swap
                                    : g_cclosure_new) (func,
@@ -164,7 +164,7 @@ gtk_signal_compat_matched (GtkObject       *object,
   
   g_return_if_fail (GTK_IS_OBJECT (object));
   
-  id = g_signal_handler_find (object, match, 0, NULL, func, data);
+  id = g_signal_handler_find (object, match, 0, 0, NULL, func, data);
   
   if (!id)
     g_warning ("unable to find signal handler for object(%p) with func(%p) and data(%p)",
@@ -333,7 +333,7 @@ gtk_signal_emitv (GtkObject *object,
   if (query.return_type != G_TYPE_NONE)
     g_value_init (&rvalue, query.return_type);
   
-  g_signal_emitv (params, signal_id, &rvalue);
+  g_signal_emitv (params, signal_id, 0, &rvalue);
   
   if (query.return_type != G_TYPE_NONE)
     {

diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 2f71b4f1e73d50064eee8d4d59a936e3d10396ab..b87ad1ec285a22846b28c5ab81aa3ba8f1933575 100644 (file)
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -47,7 +47,7 @@ extern "C" {
 #define        gtk_signal_init()                             g_type_init()
 #define        gtk_signal_lookup                             g_signal_lookup
 #define        gtk_signal_name                               g_signal_name
-#define        gtk_signal_emit_stop                          g_signal_stop_emission
+#define        gtk_signal_emit_stop(i,s)                     g_signal_stop_emission ((i), (s), 0)
 #define        gtk_signal_connect(o,s,f,d)                   gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 0)
 #define        gtk_signal_connect_after(o,s,f,d)             gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 1)
 #define        gtk_signal_connect_object(o,s,f,d)            gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 1, 0)
@@ -64,12 +64,12 @@ extern "C" {
 #define        gtk_signal_handler_unblock_by_func(o,f,d)     gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \
                                                                                                 G_SIGNAL_MATCH_DATA, 2)
 #define        gtk_signal_handler_unblock_by_data(o,d)       gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 2)
-#define        gtk_signal_handler_pending                    g_signal_has_handler_pending
+#define        gtk_signal_handler_pending(i,s,b)             g_signal_has_handler_pending ((i), 0, (s), (b))
 #define        gtk_signal_handler_pending_by_func(o,s,b,f,d) (g_signal_handler_find ((o), G_SIGNAL_MATCH_ID | \
                                                                                   G_SIGNAL_MATCH_FUNC | \
                                                                                    G_SIGNAL_MATCH_DATA | \
                                                                                    ((b) ? 0 : G_SIGNAL_MATCH_UNBLOCKED), \
-                                                                                  (s), 0, (f), (d)) != 0)
+                                                                                  (s), 0, 0, (f), (d)) != 0)
 
 
 /* --- compat functions --- */